Merge tag 'rel/1.5' and prepare for next cycle