BZ #1104093 - Tweak settings for ML2 as default