TMDM-7434: potential bug fixes, refactoring & code clean-ups, i18n message for saving/retrieving actions