Merge remote branch 'origin/roland/hwcap_mask'