Merge master in fix_integral