Issue:CRBAS-59-1-19-24