DOC-39a17.6: Changelog editing
PAY-misc-39a17.9: Some cosmetic changes
DOC-39a17.11: Changelog editing