Merge "Add Satellite 5 support"