Revert "Merging with source to 569."

This reverts commit 308736b08c840a63930b5293cedd1b1954a8b460.
Version updates and fixed some javascript issues.

Synced to 567.