Merge branch 'gianfar-fixes'