mend Meng's code ,now merging 12.16

Merge remote-tracking branch 'backup/master'

Signed-off-by: Point1 <Point1@abcd-PC>