Bug/msp 11064/go pro

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