Issue details

0097 and 0098