Add changes for context variable step expansion
get context variable expansion working
get context variable expansion working