backport changes from serenity.fluentsql