Attribution. Closes #738,#767