Merge branch '#28764_see_images_from_tp_500_error' into cmaster
Merge branch '#28765_Adding_pictures_as_attachment' into cmaster
base64 plus signs replaced with undescore.
Merge branch '#28764_see_images_from_tp_500_error_2' into dev