Merge branch 'support_for_blendfiles' into 'dev'