Merge "Revert "add exportable to declarations contains exported flags"" into main