Miscellaneous commits from Enterprise