Merged JR changes, regexes, queues translation etc