Merge branch 'feature/hdd-information' into develop