Merge remote-tracking branch 'gitlab/etriks-1.2' into master