re #8444: Avoid breaking tests in xp for memory issue
Merge branch 'feature/8444_multiperiod_data' into develop