Merge "[MS41.1] Prepare for APIs for querying usage with template"