Merge branch 'FixCLPTags'

* FixCLPTags:
  FIX: Fix some clis CLP

Change-Id: I7fa2baaeb598f2f124c9b0b24442d5a0e5e3b673