merge from develop: the fixy bit