LAC-1: Code clean jar module
Merge remote-tracking branch 'origin/master'