Updating with changes from edge branch.