Merge branch 'refs/heads/t/com_locate' into pu