Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-286: set heapgrowthlimit to 128m for CTS
  FP2-287: remove do not support features