Updating for and asjc output
Merge branch 'master' into uql.orgs