PIM-3264: pre merge cleanup