TDQ-9270 Fix the missing type of short and byte for merging function