[ci skip] Polish changes from PR #3361