use template of the linked page in case of contentFrom attribute
Merge remote-tracking branch 'origin/master'