Add GetStates command and update with custom state functionality (AST-81676)

Add GetStates command and update with custom state functionality (AST-81676) #521