Adjusted figFormat
Update from server
Merge remote branch 'origin/forFigFormat' into forFigFormat