MATTHIAS - changes to Controller for cherry-pick