BVTCK-39 Syncing with spec