Merge remote branch 'greg/2459'