US6183: TId: TA20436, status: In-progress, ToDo: .5, added some logging