Merge "Moving Historical Queries to spring boot"