Re: Requesting stable merge for commit 02d029a41dc986e2d5a77ecca45803857b346829