Merge "add parameter resolution (CDS) in User-Guide Issue-ID: DOC-569"