Merge branch 'functional-test' into factor-ahj-view