Known limitation update for #4548
Version code for bugfix release
Merge branch 'issue-4550' into release
Merge branch 'release' into upstream