Merge "Apply dev. settings at runtime Bug #7434649"