Fix minor differences between Blue Eagle 3.0 and 3.1
Merge pull request #2421 from mahagr/develop

Fix minor differences between Blue Eagle 3.0 and 3.1