Added the third_party folder and solved inconsistencies
Merge branch 'third-party-arch' into fourth_week_release