Fix specs

MSP-9277
MSP-9108
Merge branch 'feature/eager_load' into feature/compatible-payloads