Fixed FB11710
Merge branch 'stable' of github.com:Praqma/cool