Latest, final merge