ShinyCMS Upstream Merge, Prepare For Merge