Manual merge from develop into ircReleases