MPS-14286 - removed the AddMainMethod annotation
MPS-18091 - check for null lValue added