Merge "Fix construction of algorithm list" into pi-dev