Master and devel branch merge