EAGLESIX-3077: Converted v2.6.5

Not a whole lot of changes.