Cherrypicked the changes made in 3 page