[#468] Merged `upstream/develop`, resolved conflicts.