Bug fix
Merge branch 'release/release1' into develop