Fixes for 1734 & 1735

ezshrequested to merge
ezsh/fc-pregmod:summary-delegates into pregmod-master

Fixes #1734 (closed) Fixes #1735 (closed)

Edited by ezsh

Merge request reports