LPS-32295 fix logic
LPS-32295 add the same method to structures
LPS-32295 autogenerated