CON-44 #comment Previous code caused app to  crash. Working on debugging #time 20m