Merge remote-tracking branch 'upstream/master' into demo-mano-integration