merging AuthoringUI pull request 17