Merge "More cleanup prior to unhiding" into lmp-dev