Merged a change from branch v1.1