Replaced Any
uses for workaround with Box
#2250
Merged
Any
uses for workaround with Box
#2250