Merge "Support querying active record sources" into jb-mr1-dev