adding after_then and before_must advanced verification conditions
Merge remote-tracking branch 'origin/master'