Merge pull request #3332 from akretion/8.0-prepare-analytic-pos