Several enhancements, now made official

Change-Id: Ic7facdaaf0ec5f53be930c04de5bff381d6ac8c2