marge from functionalTest to develop