Merge commit 'a1394dbc8d29115780f523fdff8d6401023136ef' * commit 'a1394dbc8d29115780f523fdff8d6401023136ef': Fix issue #2249821: Unable to start passion in safe mode