minor change #4: cherry-pick 3754 merged