Adding milestone 4 requirements
Merge branch 'refactor-mysqlprovider'