Backport main changes (#900, #911, #912, #922, #923, #934, #939, #933, #934, #938)#937