importing changes from branch 'reactivezoom'