[OE-4491] batch expiry validation
Merge branch 'release/1.7' into release/orbis-r2