Merge commit 'origin/platal-0.9.17'