Merge branch 'bruce_leo' into test