#19969 bisma changes