[VirtualBox/f31] (7 commits) ...Fix conditional again