TVPJSFRMWK-1454 - Changes based on code review