Add support for the "OnlyShowIn" and "NotShowIn" tags and merge with upstream commits