API-859 checking into source.