Merge "make @hide actually hide"