Merge branch 'MasterBugFixing' into 'master'