Bug/msp 11064/go pro

VERIFICATION STEPS
- [ ] code review
- [ ] make sure specs pass
- [ ] the rest must be verified on kali