Remove trivial differences

Remove trivial differences between this branch and upstreamDevelop