Merge "Fix DestroyContext bug" into devel/master