LPS-34785 make the framework always on
LPS-34785 SF & Cleanup