LUGG-138 : Changes for blocks with p