Tracking ToT changes

Fix for MCContext interface change.
Fix for "option" library requirement on Linux. Windows fix will go separately.