Merge pull request #1886 from ambroise-arm/av/static-checks