merged from latest anastas trellisupdates which fixed the bug in pccc encoder and decoder