fixing locus persistence issue
Merge branch 'origin/master'