Merge branch 'mr/opt-set-ptr'