JAL-3560 from JAL-3563. This commit is expected to be reverted. Just