Correctly handle shorthand byte values (see #6345)
Merge branch 'hotfix/3.1.5' into develop

Conflicts:
	system/docs/CHANGELOG.md