refs 6167 modified ability
Merge branch 'master', remote-tracking branch 'origin' into issue5974