Fix optimizer
Merge branch 'development'