TDI-30683:avoid the possable NPE pb and fix another context proposal
description match pb.
Merge branch 'maintenance/5.6'