Issue #1836424 by suresh: Modified the feature and added new scenarios and step definitions and ported to 7x.