Fix #23588 - remove empty lines when sorting and add grep+end test ##…

Fix #23588 - remove empty lines when sorting and add grep+end test ##… #2631