rebased master into strict table