Rebase to 15.7.0 (untested)