Component b - I make a pull request from wonchana repo to origin1 at component B ka.

This is pull request for merge change from Componenet B on Wonchana to Origin1