Allow base 4.5.*
Merge branch 'master' into new-pp-system