Fix react warning
Compiled Version
Merge master into compiled