commit changes that I don't know if I pushed in official version or not
Merge branch 'master' into speculativeChanges
Merge branch 'master' into speculativeChanges