refs #1888 - Synced with production settings

After the merge I will update also the production with version 1.4