JGRP-1698 Bypass on FLUSH