taking a shot at cap deploy fix
Merge branch 'stage' into stage2