Fixes warning: size of anonymous bit-field exceeds size of its type;
Merge branch 'hotfix' into dev