Fix template and class in block infrastructure
Merge branch 'gpns-anna' into anna
Merge remote-tracking branch 'upstream/anna' into anna