Merge branch 'ab/test-lib-diff-cleanup'