post-18

DISCOVERY-1090 phase 2 (scaled)