JGRP-1898 Fixed partially applied change