renamed frameResize to resize
Merge remote-tracking branch 'origin/develop' into alex_dev