Patch 4

Updated geek-sources-3.17.x