No, this should be inside backward-incompatible changes