Merge remote-tracking branch 'ups/develop' into multithreads