Merge "Gerrit contains following changes : 1) Fix for bug 284. Added functionality...