Removed w17 tag, and commited new bug fixes for newer w17 release.