Merge auto settings changes forward to master