Prepare release 4.2.1

Change-Id: I2aa19049325e3a2d092d175b852b1fb8a510972e