GF32723 Partial fix (switching without code replacement)