Merge 180d9b7 into case-3115.
Fix fuckup in commits.
Merge branch 'case-3115' into easy