Merge gc-prq into master