SCRIB-1016 SCRIB-8213 SCRIB-8214 SCRIB-8215 SCRIB-8216
Revert "SCRIB-1016 SCRIB-8213 SCRIB-8214 SCRIB-8215 SCRIB-8216"

This reverts commit 0e82ca65229b4d5739c82411757c2267dd1885bc.
Revert "Revert "SCRIB-1016 SCRIB-8213 SCRIB-8214 SCRIB-8215 SCRIB-8216""

This reverts commit a8fe72aee1a7e6b4025a4c3e785bd71655a6d3fc.