#2150 wip - added change log
#2150 updating comments