Merge "FEATURE: add custom ad-hoc queries for schedulled run, etc"