[Issue 8845] Cannot preserve existing controls with new extended operations