Merge remote-tracking branch 'ilja/fix_tagpolicy_to_also_work_on_updates' into develop