Merge "Fix bug 2554 - XSQL getting stuck on some models"