Merge remote-tracking branch 'remotes/origin/651-framework-improvements' into framework_maintenance