Merge branch 'platal-0.9.15'