Merge "Revert "Revert "Add pulled atoms support for native clients in s...""