EAGLESIX-2696 formatting changes and merge goodness