(chore) update branch release/3.9.0 and fix MR conflicts

Edited by Martin Santangelo