Room template fix from Nomad
Update changelist.