Ace compatibility fix
Merge branch 'develop'