minor change #5: cherry-pick 4194 merged