9.3.2 merge valueChanged MR by Oriol Vallcorba