[Sprint 49] Bo fix
Merge branch 'develop' of github.com:criscosg/IHorseBO into develop