[Npos_2018] final PR