Merge branch 'hotfix_save_as_set_article_ids'