FastForwarding data.lnx.3.0-dev from data.lnx.2.1-dev

Change-Id: I6e155b1a8a150bd898d54ba2a85e4bef83264ba7