Merged license related changes with user override work and some sretrieve work