PIM-3326-stable : Fix PSR2