Merge "Revert "Move Some Devel Properties & APIs to the Public API"" into devel/master