SONAR-5329 - Consolidation of Migration with Batis