Merging dev branch into integration branch

preparing for weekly drop