BHV-10817: Optimize
BHV-10817: Remove comment