CFTMT-6: fixed now on popup-show it set forces
Merge branch 'master' of https://github.com/entirej/incubator