Data/APIs Sprint 68 rss 

This PR is amalgamation of other PRs made to one branch:
#4501 
#4518