Merge Master into Experimental Hotfix T1.04.2