Jacks Repository: post 4395 - minor edits
resolve conflict