Merge remote-tracking branch 'tuncer/remove-obsolete-sys.config'