Merge branch 'gerrit/goldfish' into 'master'

Change-Id: Ib3821e38271fa4dd589179d25b2c599d885b4292