Preparatory commits for "universal door"

These changes are needed to support the universal door.