Feature/pim 1555