Merge "Remove reference to internal settings bool"