added resize-in helper
Merge branch 'develop' into merge