Imported changes from development branch