Merges in community contributions from @arknu, @dampee and @calaa