fixes for gq-225
Merge branch 'gq-225'