PIM-2166: Update changelog
PIM-2166: Create scenario for fix
PIM-2166: Add more comments
PIM-2166: Clean features