Merged changes from 1.3.3 hotfix.