Restoring some changes lost in merging dev with master.