Merge "Trace use scope macro instead of begin-end" into devel/master