[dev] Issue after upgrade to 3.1.10