Merge "Policy 1707 commit to LF"