Issue #2843748 and #2843747 by nehakhadke, binoli.addweb, pankajsachdeva, nehakhadke, pankajsachdeva: Fixed some bug.