Fix issue #230
Merge branch 'dev' into hybrid