Merged FCP-INDI into 0.3.4b_release manually