UPS-989 php mermoy limit
UPS-1414 seperate promotions and advantages
Merge branch 'develop' into feature/UPS-989