Merge latest from ligershark

Merge latest from ligershark