Merge "Fix uninitialized macro reference member" into sc-dev