Merge "Sonarfix in structures.py"