[WG-UMA] Proposal for issue #358, sub-issues (a) and (b)