ShinyCMS Upstream Merge, Initial Merge