FYI @papanest @mmccann @sgambett
Made WIP so it can be checked first.
Note, we would like to request the fake ONLINE DB tag is updated to include this, once merged.