merge in master-release history after reset to 4aecf0f557a805bb3f2715cade0ab15f6b99ad39