Merge in changes from ve-sprint-19