Merge commit 'dm/experimental' into test branch