SDK-11 Fixed dependencies loop
Fixed formatting
SDK-11 Updated filename