Update CRA and dbconnector
Merge fix