v0.15.1 Hotfix

See commits