merge branch aop for step logging feature