Updated recent changes for v0.17