Merge remote branch 'crater/DragonFly_RELEASE_3_0' into rel3_0