RESTCOMM-570 #Resolved Fixed

(cherry picked from commit eae513b941166d550bf3306ed8bcac99350227a7)
RESTCOMM-578 #Resolve Fixed

(cherry picked from commit 395f8b5c92554b932feeb014191488c9b749fea2)