Initial commit of the hot fix update