fixes confirmed through epoching step
Merge remote-tracking branch 'origin/master'