Incorporated changed implemented as part of Mata CMS

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>