Merge branch 'MasterBugFixing'