Last part of component helper merge ( including the fix contains -> containsKey for the test case ) PR: Obtained from: Submitted by: Reviewed by: