Merge "Add Priority Hints support"