PIM-3321: fix conflicts
PIM-3321: improved specs