[girl/f25] (2 commits) ...Update to 9.6.0