Merge latest from ligershark

Getting latest from ligershark