Merge "CPS-594: Exception when updating list node PATCH"