PLA-217 on() functions intendation change