CIC-1034 fix
Merge branch 'master' of https://github.com/leochen41/activerun