Port back the hidden property from L3 branch