issues 84488
Solves conflicts
Merge branch 'lnabergoi-master'