Merged latest changes to master into blue-branch and added required resources/images