Committing some local changes in advance of clean up for rcm