Merge remote-tracking branch 'origin/rel-15.02' into next