Update EndCommand implementation to resolve issue occuring due to resolution implemented for SKB-38