Release version 2.1

Change-Id: I8a612409703a239f87a5e1e0f01bce269e28b2f5