Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1