Develop Hotfix as Discussed

For your review.