Added myself to the license.
Apply fix for SDK limitation.