see inline comment.
Merge branch 'hotfix/2.1.2.1'