post-06

DISCOVERY-1090 phase 2 (scaled)