Porting from 53X

Porting from 53X