- Added MASSEMBLY-652