PIM-3372 merge on master