@yigit Appreciate it! All the lines marked in green is the latest version, correct?
Could you paste the snippet or section of code rather than the whole file? We have a custom site off enfold where this file has been modified, but we’re running into this issue. Not sure what parts to replace.