Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev