Updated to version v0.20.0-SNAPSHOT
Fixed errors caused by merge of v0.19.1 and v0.19.2 code.