Henrik Rusche - 2014-06-03

Both issues will be fixed by the planed solution control backport

Assigned to me a placeholder