Fix a maybe-uninitialized GCC warning
Merge branch 'develop' into feature-15bpp-processing-internally