Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
Perhaps "should not be present in production configuration files"?