Changed to use combined progresso module
Merge remote-tracking branch 'origin/master'