MyShinyTemplate Upstream Merge, Initial Merge