CDB-3497 ongoing spec stabilization