The changes from hotfix/2013-12-04 that we want permanently