further sync with 53X branch