Merge branch 'master' into change-solver-hook-api