last few hotfixes from release-03132014