forward merge lxc fixes