Merge commit 'dkg/master'