Merge PIM-3430 PIM-3406 PIM-3358 to master