Merge "Fix issue where install restrictions were not properly enforced." into udc-qpr-dev