Developer1: Merged master into acceptance