Develop - Changes by Sonia, Yogesh

Updates for QA Post handoff.