Updated to reflect Lib changes
Merge branch 'master' into MC1.6