removed disable asserts
Merge branch 'production'