Rebase of PR 3608