Squashed merge of logging branch (5695e60)