Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'