Merge version 0.20.0