Merge "Fix trace factory compilation." into devel/master