CROSS-1186 Merging master in relooking