Merge branch 'refs/heads/t/ls-p_deprecation'