add Creator handling to feature
modify mandala test:  test creator handling feature
Merge branch 'creator_feature'