Merge remote-tracking branch 'franco/nightlies' into nightlies