125674-hotfix-08-may-2015