Merge of v1.55 into v1.60 but too many conflicts, saving on branch confict-merge-v1.60