Merge remote-tracking branch 'upstream/master' into 766-Slider-to-control-withdraw_vesting-amount-fixed