Merge commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb' * commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb': Fix SQLite limit issue.
Merge commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb' * commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb': Fix SQLite limit issue.