Prep work for CDMv5 support