merged rolands commit