Fixes for showing claims with no associated form template
Merge remote-tracking branch 'origin/master'