Backport of version 1.2.0.0

Added Q10
Corrected Z10 size