Develop - Changes by Priyanka and Yogesh

Updates for issues reported by Jas