MDL-23927 improved guest handling