Close Bugs# 1389448 Merge to R2.0