Merge latest nightscout:dev into wip/iob-cob