merge Log4AK.java, LogAuto.java from develop branch