V7.1 Bugfix Release

Change-Id: I4f7b47d79d85def7da8190f5e55441ef8dbd7474