Merge branch 'fix-install-rules' into release