Vid 288 merge to dev

This is just merging to dev what I merged to release-165 last night.