Merged in some edits made on v1.55 branch