Merge branch 'hotfix/chipsbugs'
Merge branch 'develop' of https://github.com/Edgar160/test into develop