PIM-2287: Update CHANGELOG
PIM-2287: Remove @TODO