Sqoop 1366

synced with original upstream