File catalog current state
Merge remote-tracking branch 'o/master'