Merge everything from combined method
Merge remote-tracking branch 'origin/master'
Final bits to make sources identical for main lib and combined method