Merge "Resolve Bug:522"