[MERGE]: merging from the development branch 1