Merge commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b' * commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b': Add development setting for compatibility mode.
Merge commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b' * commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b': Add development setting for compatibility mode.