Closes #3480257 - Codign standard issues
Merge request pipeline #307604 passed with warnings
Merge request pipeline passed with warnings for c67c4668 3 months ago