Revert "JazzHub Story_18369"

This reverts commit 68597f29f9973f3ff2c75b4e18b2c0ce4fd75a30.
Revert "JazzHub Story_18369"

This reverts commit 9839ade6c4e5b3547c6a8088c9f2df843150545e.
Revert "JazzHub Story_15368"

This reverts commit 9d8c5dfb575d29674316f8e7cd8666b5b1f2055f.