ref #1411 (comment)

Document the temporary workaround in devel release doc. Cherrypick the workaround into master branch if needed (and add a TODO about removing it once we fix the issue in gen repo).