Merge pull request #7471 from jflyper/bfdev-4.0-compatible-acc-alignment