manually merged 4a2171b from master
manually merged 1a9ecbd00e from master
Merged most recent OSC changes