commit before merge from master - stable