Merge remote-tracking branch 'shared/master' into leap_master