issues 84488
Solves conflicts
Merge branch 'lnabergoi-master'
Added Archiving state in Quality Control check status