Pull updates from primaces branche 5.0.x (5.0.4)