Merge branch 'platal-0.10.0'