Revert "Manal 1.0 changed"

This reverts commit 902849035cd86e3a867859dd63f2299bb6b58245.
Revert "Revert "Manal 1.0 changed""

This reverts commit 65b60e5f9c7d8277bfb8b699015510051fd76a64.