TMDM-7702: bug fix on Action Panel and code refactoring