Various PR's with new versions, consolidate to one PR to be able to review and merge
Various PR's with new versions, consolidate to one PR to be able to review and merge