git cherry-pick 505d7d9 (conflict resolved)