Merge feature 'remove rest calls from workflow' from TheBayOr