Merge changes from topic 'spec-2089'