SOC-4356 | [TC-PLF-4.1-RC1] UndeclaredThrowableException
Merge commit 'de0ae03a89be9b797a5f8f4bc862a87e8effb409' into HEAD