remove vendor's story req; change tests
Merge branch 'enhancement/17451' into develop