Compatible 1 6 5

Merge latest development work