Manually merged riches' PR