Is this change related to this PR?