Merge branch 'release/v0.0.1-1n' into develop
Manual fix
Bumped with encodeuricomponent
Conflict merge