Merge commit 'crater/master' into DragonFly_RELEASE_2_2