Issue 6227 6226 6224 license changes