Monolithic october update & sync with cleanups and CM merge