Hotfix for missing import
Merge branch 'release/v0.2.4'