[520] removed immutable object pattern to facilitate template flattening

Revision: 520
Author: rong.chen
Log Message: