Merge pull request #15682 from seamuslee001/dev_core_1344_aditional_if