Start rebuild FS as a singlton
Rebuild as singleton
rebuild as singleton
Merge branch 'FI_singlton'
Rebuild to singlton