[LOC-281] FIX return @ onchange methods

Merged Macarena Meldi requested to merge LOC-281 into 15.0-stage

Closes LOC-281

Merge request reports