Merge "Update CM Handle Query RTD with Casing Convention"