Commit source for issue 453