fixed merge issues, upgraded replicate to work with master's new vers…

fixed merge issues, upgraded replicate to work with master's new vers… #2140