Merge "Fix for Bug 262 - goes with controller Gerrit3929"