Merge "resolved sonar issue in QueryServiceMacroHolder"