Merge "Partial revert of commit ccb7ac6b6552c0692cf002364cdaaba676d47350"