Add last minute fix
Merge branch 'release/REL-0.1' into develop