Changes from my workbench for the develop branch