amends for branch 1.6