Merge branch 'mdsal-trace' from controller