Commit for ticket 255