Typo
Add JIRA issue reference in TODO
Merge branch 'master' into 5.6.0