Merge "SF: add trace for composer execution time" into sc-dev