CMS-3330 Live Edit - Adjustments to Context Window