Merge "Fix defect SO-36"