- Added MASSEMBLY-696