[c12652] Basic implementaion of hotfixes