0.3.7 dev

Pull in changes from main FCP-INDI 0.3.7_dev branch