Merge "add license scan to stage_2"