shifter --walk on this branch
Make building faster
Removed duplicate history entries for 3.6.0 change
Merge build