Merge "Import jack and jack-admin 1.3-a5"