Merged changes
Merge branch 'recampbell-jenkins-19587'