Jaideep | Consistency in error messages, button fix on r&r template config