Merge "Fix decorator color update issue" into devel/master