Merge dev-branch with fogservice-rewrite.