[Npos_2018] update from Plantum