Merge commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15' * commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15': New constants for db upgrade.
Merge commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15' * commit '3790933aa33e5f1d411b1ed7b31210abff5a5b15': New constants for db upgrade.