Merge Hai's 0.3.2 development changes into FCP-INDI 0.3.2 development.