Finalize merge from @jspillers