EAGLESIX-2651: Not: misc formatting from 2.6.5 port