Merged in adjutant code from v1.65