Develop - Changes by Nilesh, Priyanka and Yogesh

Fixes for QA sent by Client post handoff