[SOAP-8] #resolve
[SOAP-8] Merge from 1_2_X