Merge "Fixing ADD_CALL (3/3)" into lmp-dev