Manually merged main and mapugina fork