added spec run context fix
merged with master