[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622