Pullrequest to upstream

Include the use of Migrations for installation purposes