RF-13812: make  non-conflict, change ambiguous method