fix new Controller Owner
fix owner 2!
Merge branch 'origin/master'