Zlatko Petrov commit

Zlatko Petrov commit