For my readers.
Merge branch 'hotfix/1.4.1.2_3.1'