LPS-47835 Add async portion as a callback to avoid race condition
LPS-47835 SF