New branch for general build v1.24
Removed unnecessary .swp file
Merge branch 'gb-1.24'