Merge changes from topic 'be/migration/mdsal'