IM-629: backend pypo changes