Merged PR 185 from parent project