Some fix to fit to 3632
Merge branch develop
Change bash history filesize