Merge pull request #3777 from aparcar/noci-19