Re-instated fix for numeric-comp and defernums
Merge branch 'dev' into ms