reverted four changes made by mistake to master instead of devel