fixing heigh issues at interop
Merge branch 'master' into gh-pages