Merge branch 'master' into feature-function
popups and bug fix
Merge branch 'feature-function'