CDB-3844 spec stabilization