Merge remote-tracking branch 'origin/master' into v4.0

Fix stage3 for v4.0 branch: proper list of components

Change-Id: I97f693e14cd6e6c2c215629700d193fec3c30d76