1710 Rebase - Second Attempt