CIC-1029 fix bug in edit mode
Merge branch 'master' of https://github.com/leochen41/activerun