Merge branch 'rl/am-3way-config' into next