Merge branch 'develop' into feature-rop
Fix reactOnPromotion #107 (2/3)
Merge branch 'feature-rop' into develop