Development branch merge. Version 1.7