Merge "Fixing issues found by prevent2 (49866)"