Merge "AaflurAndFish.java - fixed sonar issue"