Updated to version v0.20.1-SNAPSHOT