PUBSTWO-939 - very rough first draft