post-08

DISCOVERY-1090 phase 2 (scaled)