#1057 | Jagat | Design for the R&R regular and emergency fields