Atish | Changed diagnostics, log4j and WayGenNextLogsController