Merge branch 'platal-0.9.16' into platal-0.9.17