merging latest from 4.11.2