Commit source for issue 531