[522] changes due to removal of immutable object pattern

Revision: 522
Author: rong.chen
Log Message: