Merge from dev 1.11.4