[Npos_2018] final draft PR for Monday