Fixed DB migrate issue.
Merge branch 'master' into Comment_Unit_Tests