gap-refactoring
fix after review
Merge branch 'gap-refactoring' into rc-0.4.0