Merge tag 'unableToAnwserInTheForums' into develop

2.1.1
Merge branch 'master' into develop
default env = production
Merge branch 'develop'