Merge last changes 2