Merge branch 'porting_to_m64'