Merge "PassDeleteAction.java-sonar major fixes"