Merge pull request #170 from pamval/5.2

5.2
[PPP-3349] - Ace modes with incompatible license