Merge "Enable weak functions properly." into main