Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint