Manually merge #578 to master