LOOM-1284 and LOOM-1376