Synced up with master copies in 0-common/schemas