Merge "Eliminated TOKENEXTRABITS"