Merge remote-tracking branch 'origin/kusanagi' into connor-fix-avenant