[sprint 47 resolved issues madhusudhan]