Merge commit 'indolent/natsemi'