Merge branch 'feature/cleanup-fixed_int' into 'develop'

Feature/cleanup fixed int

See merge request !31
3 jobs for develop in 6 minutes and 14 seconds