Merge pioneer master

Bringing Paragon master upto speed with Pioneer