Merge "Move LNB and constants"