Merge branch 'release/0.21' into develop
Correct multi-lines continuation #1
Merge branch 'develop'