Merge pull request #2382 from dunxen/2077-followups