Updated Support Library
Merged
Merged conflicts