merge code change from OQ 3.9.3