Pulling changes from kbsali

Pulling changes from kbsali