Merge "Migrate from beginSection to beginTrace" into rvc-dev