Merge "Add FMQ support in PowerAdvisor" into main