Merge branch 'platal-0.9.17' into hruid