DefendIt 0.21 merge