Manually merged (#406)