merge fixes from develop to release4.11.0