Is this change related to the topic, or should it be placed in a separate PR?