CX-036339: 737-A Office Improvements