Merged changes from development branche