Task #1511 and updated changelog