Fixed LightBridge bug.
Resovled merge conflict.