Merge Changes from Nagyrobi