CDB-2959 spec stabilization