Merge branch 'gianfar-next'