Merge tag '1.5.12' into develop

Decoupling Pii.
back to develop
Final look at Pii for release.
Release prep
Merge branch 'release/1.5.13'