Plus version 1.6

Change-Id: Iec511868f4c13797eba5fa1db0ce899cfde4f7c1