Tag for RC3
Merge commit 'b70dd5e408a862a0e2c3a378b7160710d81c8ce6'