Version 3.1.4

Change-Id: Ifa423aff149ab9836368fa628ad00f1711506a8d