rebase ARMvj6