merge wnj changes plus lint