0.5.2 - Intermediary PR for CI purpose