HomePhorge

Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into next
ce9a6f97ab17Unpublished