[#2212] CID49407:

united like code paths