testing after reversion back to 1.2.3.pre1
post revert 1.2.3.pre1 merge