Merge of Nordic branch with CMSIS-DAP master