Replaying work on reference columns onto new dev 2.0 NPOCO features