Merge PR from jyaganeh