Changes for a snapshot build with new chorus context variable step expansion