Merged changes from Master branch related to all new changes in the app.