PLCBC-12: Add 'compat' tests, and fix compat-mode cas

Also, forward-port some fixes from 'stable' mode