#4163 merge bug fix from 6.0.2