[ALOY-967] add in changed made by another pr