Unhardcode all the things
Merge branch 'release/1.1.1'