Revert "framework commit"

This reverts commit 683717eeb37de61cd9a33909f88c8099858edf5b.
Revert "Revert "framework commit""

This reverts commit 8739cb6a8d9abfed9570dea601ccbeb2674671f1.