MergeToStableBranch - From (7ff2f035b72a609eb84d073282a168880d9e259a) OpKeywordData class refactoring and code clean up