merge: branch 'lr/virtual-parent-bgo762731'