Added resize no construct
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/master'