Backport completeness calculation from Master