#5465 use strlen instead of empty
#5465 unit test
#5465 added link to github issue
Merge pull request #5551. Fix #5549 in master
#5465 removed any trailing whitespace for coding standards
#5465 used php coding standards fixer to correct file
Merge pull request #5499
Merge pull request #5499 in develop