CDB-3497 Finished stabilizing specs