BZ-10041 fixed file selection
Merge remote-tracking branch 'refs/remotes/origin/master'