- Added MASSEMBLY-666