ANY23-172 Fix minor issues with Any23 0.9.0 RC
Merge branch 'master' into ANY23-akn