Merge "[CPS] Database port made configurable"