Merge fix PIM-3254 on master