CLC-4485 - multiple spec fixes