fixed JENKINS-21116
Merge pull request #76 from CoreMedia/JENKINS-21116

fixed JENKINS-21116
Merge remote-tracking branch 'upstream/master' into master-work