Merge branch 'fix-static-private-non-target-depends' into release