changing log table schema; partial backporting of given/when