Merge branch 'ld/p4-test-py3' into HEAD