Merge remote-tracking branch 'origin/bug-1236' into release