Complete migration of my2ortoloco
Minor changes for migration
Merge remote-tracking branch 'origin/master'