Merge branch 'dev' into staging
Update integration repo.
fixed migration rebasing order
few test updates
Merge pull request #155 from jdragojevic/wd-updates-3

few test updates