Merge "Make DEBUG not static" into main