diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini
index dc4d6c87ed..28eaf381d6 100644
--- a/administrator/language/en-GB/plg_sampledata_blog.ini
+++ b/administrator/language/en-GB/plg_sampledata_blog.ini
@@ -13,9 +13,10 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the top menu. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Systems menu on the Install module, select Extensions from the list and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules and articles, setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_FULLTEXT=""
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_INTROTEXT="<div><h1>Colour scheme standard</h1> <p> <span class=\"btn btn-secondary\">secondary</span>   <span class=\"btn btn-primary\">primary</span>   <span class=\"btn btn-info\">info</span>   <span class=\"btn btn-success\">success</span>   <span class=\"btn btn-warning\">warning</span>   <span class=\"btn btn-danger\">danger</span> </p> <p><span class=\"text text-secondary\">text-secondary</span>  <span class=\"text text-primary\">text-primary</span>  <span class=\"text text-info\">text-info</span>  <span class=\"text text-success\">text-success</span>  <span class=\"text text-warning\">text-warning</span>  <span class=\"text text-danger\">text-danger</span></p><h1>Typography (h1)</h1><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h2>Lorem ipsum dolor sit amet (h2)</h2><p><strong>Lorem ipsum dolor sit amet, consectetuer adipiscing elit </strong> (strong), sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h3>Lorem ipsum dolor sit amet (h3)</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h4>Lorem ipsum dolor sit amet (h4)</h4><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h5>Lorem ipsum dolor sit amet (h5)</h5><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p> <p><a href=\"index.php\"> Lorem ipsum dolor (a)</a></p><h1>Lists</h1> <p>(ol)(li)</p> <ol> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ol> <p>(ul)(li)</p> <ul> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ul> <h1>Displays</h1><p class=\"display-1\">Lorem (display-1)</p><p class=\"display-2\">Lorem (display-2)</p><p class=\"display-3\">Lorem ipsum (display-3)</p><p class=\"display-4\">Lorem ipsum (display-4)</p></div>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_INTROTEXT="<div><h1>Colour scheme standard</h1> <p> <span class=\"btn btn-secondary\">secondary</span>   <span class=\"btn btn-primary\">primary</span>   <span class=\"btn btn-info\">info</span>   <span class=\"btn btn-success\">success</span>   <span class=\"btn btn-warning\">warning</span>   <span class=\"btn btn-danger\">danger</span> </p> <p><span class=\"text text-secondary\">text-secondary</span>  <span class=\"text text-primary\">text-primary</span>  <span class=\"text text-info\">text-info</span>  <span class=\"text text-success\">text-success</span>  <span class=\"text text-warning\">text-warning</span>  <span class=\"text text-danger\">text-danger</span></p><h1>Typography (h1)</h1><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h2>Lorem ipsum dolor sit amet (h2)</h2><p><strong>Lorem ipsum dolor sit amet, consectetuer adipiscing elit </strong> (strong), sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h3>Lorem ipsum dolor sit amet (h3)</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h4>Lorem ipsum dolor sit amet (h4)</h4><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h5>Lorem ipsum dolor sit amet (h5)</h5><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p> <p><a href=\"index.php\"> Lorem ipsum dolor (a)</a></p><h1>Lists</h1> <p>(ol)(li)</p> <ol> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ol> <p>(ul)(li)</p> <ul> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ul> <h1>Displays</h1><p class=\"display-1\">Lorem (display-1)</p><p class=\"display-2\">Lorem (display-2)</p><p class=\"display-3\">Lorem ipsum (display-3)</p><p class=\"display-4\">Lorem ipsum (display-4)</p><p class=\"lead\">Lorem ipsum arma virumque cano (lead)</p></div>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_TITLE="Typography"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROIMAGE_ALT="Amazing Andromeda Galaxy"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROTEXT="<p>This is a sample blog posting.</p><p>If you log in to the site (the Author Login link is on the very bottom of this page) you will be able to edit it and all of the other existing articles. You will also be able to create a new article and make other changes to the site.</p><p>As you add and modify articles you will see how your site changes and also how you can customise it in various ways.</p><p>Go ahead, you can't break it.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_TITLE="Welcome to your blog"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FIELD_0="Uurnip greens yarrow ricebean endive cauliflower sea lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus winter purslane kale."
@@ -23,6 +24,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FULLTEXT="<p>On the full page y
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the next two oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More span to insert a break.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXTIMAGE_ALT="Crab Nebula"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. </p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
diff --git a/images/sampledata/cassiopeia/nasa1-1200.jpg b/images/sampledata/cassiopeia/nasa1-1200.jpg
new file mode 100644
index 0000000000..4ed2784a30
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa1-1200.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa1-400.jpg b/images/sampledata/cassiopeia/nasa1-400.jpg
new file mode 100644
index 0000000000..b3f9a8ec66
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa1-400.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa1-640.jpg b/images/sampledata/cassiopeia/nasa1-640.jpg
new file mode 100644
index 0000000000..10ae0f4aae
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa1-640.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa2-1200.jpg b/images/sampledata/cassiopeia/nasa2-1200.jpg
new file mode 100644
index 0000000000..fffc8eda31
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa2-1200.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa2-400.jpg b/images/sampledata/cassiopeia/nasa2-400.jpg
new file mode 100644
index 0000000000..4f9faf2cbf
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa2-400.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa2-640.jpg b/images/sampledata/cassiopeia/nasa2-640.jpg
new file mode 100644
index 0000000000..832ac2cb12
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa2-640.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa3-1200.jpg b/images/sampledata/cassiopeia/nasa3-1200.jpg
new file mode 100644
index 0000000000..be88461c7b
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa3-1200.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa3-400.jpg b/images/sampledata/cassiopeia/nasa3-400.jpg
new file mode 100644
index 0000000000..0bc077ca20
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa3-400.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa3-640.jpg b/images/sampledata/cassiopeia/nasa3-640.jpg
new file mode 100644
index 0000000000..168c0e6d49
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa3-640.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa4-1200.jpg b/images/sampledata/cassiopeia/nasa4-1200.jpg
new file mode 100644
index 0000000000..c5a4f8c9e4
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa4-1200.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa4-400.jpg b/images/sampledata/cassiopeia/nasa4-400.jpg
new file mode 100644
index 0000000000..d126238808
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa4-400.jpg differ
diff --git a/images/sampledata/cassiopeia/nasa5-400.jpg b/images/sampledata/cassiopeia/nasa5-400.jpg
new file mode 100644
index 0000000000..7b1332a010
Binary files /dev/null and b/images/sampledata/cassiopeia/nasa5-400.jpg differ
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index 4acaf65480..b9e36e9f15 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -564,7 +564,6 @@ public function onAjaxSampledataApplyStep1()
 				'access'   => 3,
 			),
 
-			// Category 0 = Blog
 			// Category 0 = Blog
 			array(
 				// Article 2 - Welcome to your blog
@@ -572,14 +571,16 @@ public function onAjaxSampledataApplyStep1()
 				'featured' => 1,
 				'tags'     => array_map('strval', $tagIds),
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
-					'float_intro'            => 'left',
-					'image_intro_alt'        => '',
-					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'float_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
+					'image_intro'               => 'images/sampledata/cassiopeia/nasa1-1200.jpg',
+					'float_intro'               => '',
+					'image_intro_alt'           => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROIMAGE_ALT'),
+					'image_intro_alt_empty'     => '',
+					'image_intro_caption'       => '',
+					'image_fulltext'            => 'images/sampledata/cassiopeia/nasa1-400.jpg',
+					'float_fulltext'            => 'float-left',
+					'image_fulltext_alt'        => '',
+					'image_fulltext_alt_empty'  => 1,
+					'image_fulltext_caption'    => 'www.nasa.gov/multimedia/imagegallery'
 				)
 			),
 			array(
@@ -588,13 +589,16 @@ public function onAjaxSampledataApplyStep1()
 				'featured' => 1,
 				'tags'     => array_map('strval', $tagIds),
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
-					'image_intro_alt'        => '',
-					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'float_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
+					'image_intro'               => 'images/sampledata/cassiopeia/nasa2-1200.jpg',
+					'float_intro'               => '',
+					'image_intro_alt'           => '',
+					'image_intro_alt_empty'     => '',
+					'image_intro_caption'       => '',
+					'image_fulltext'            => 'images/sampledata/cassiopeia/nasa2-400.jpg',
+					'float_fulltext'            => 'float-left',
+					'image_fulltext_alt'        => '',
+					'image_fulltext_alt_empty'  => 1,
+					'image_fulltext_caption'    => 'www.nasa.gov/multimedia/imagegallery'
 				),
 				'authorValue' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FIELD_0'),
 			),
@@ -604,12 +608,16 @@ public function onAjaxSampledataApplyStep1()
 				'featured' => 1,
 				'tags'     => array_map('strval', $tagIds),
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
-					'image_intro_alt'        => '',
-					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
+					'image_intro'               => 'images/sampledata/cassiopeia/nasa3-1200.jpg',
+					'float_intro'               => '',
+					'image_intro_alt'           => '',
+					'image_intro_alt_empty'     => 1,
+					'image_intro_caption'       => '',
+					'image_fulltext'            => 'images/sampledata/cassiopeia/nasa3-400.jpg',
+					'float_fulltext'            => 'float-left',
+					'image_fulltext_alt'        => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXTIMAGE_ALT'),
+					'image_fulltext_alt_empty'  => '',
+					'image_fulltext_caption'    => 'www.nasa.gov/multimedia/imagegallery'
 				)
 			),
 			array(
@@ -618,70 +626,72 @@ public function onAjaxSampledataApplyStep1()
 				'featured' => 1,
 				'tags'     => array_map('strval', $tagIds),
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
-					'image_intro_alt'        => '',
-					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
+					'image_intro'               => 'images/sampledata/cassiopeia/nasa4-1200.jpg',
+					'float_intro'               => '',
+					'image_intro_alt'           => '',
+					'image_intro_alt_empty'     => 1,
+					'image_intro_caption'       => '',
+					'image_fulltext'            => 'images/sampledata/cassiopeia/nasa4-400.jpg',
+					'float_fulltext'            => 'float-left',
+					'image_fulltext_alt'        => '',
+					'image_fulltext_alt_empty'  => 1,
+					'image_fulltext_caption' => 'www.nasa.gov/multimedia/imagegallery'
 				)
 			),
-
 			// Category 2 = Joomla - marketing texts
 			array(
 				// Article 6 - Millions
 				'catid'    => $catIds[2],
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
+					'image_intro'            => 'images/sampledata/cassiopeia/nasa1-640.jpg',
+					'float_intro'            => '',
 					'image_intro_alt'        => '',
+					'image_intro_alt_empty'  => 1,
 					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'float_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
 				)
 			),
 			array(
 				// Article 7 - Love
 				'catid'    => $catIds[2],
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
+					'image_intro'            => 'images/sampledata/cassiopeia/nasa2-640.jpg',
 					'float_intro'            => '',
 					'image_intro_alt'        => '',
+					'image_intro_alt_empty'  => 1,
 					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'float_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
 				)
 			),
 			array(
 				// Article 8 - Joomla
 				'catid'    => $catIds[2],
 				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
+					'image_intro'            => 'images/sampledata/cassiopeia/nasa3-640.jpg',
 					'float_intro'            => '',
 					'image_intro_alt'        => '',
+					'image_intro_alt_empty'  => 1,
 					'image_intro_caption'    => '',
-					'image_fulltext'         => '',
-					'float_fulltext'         => '',
-					'image_fulltext_alt'     => '',
-					'image_fulltext_caption' => ''
 				)
 			),
 			array(
 				// Article 9 - Workflows
 				'catid'       => $catIds[1],
+				'images'      => array(
+					'image_intro'               => '',
+					'float_intro'               => '',
+					'image_intro_alt'           => '',
+					'image_intro_alt_empty'     => '',
+					'image_intro_caption'       => '',
+					'image_fulltext'            => 'images/sampledata/cassiopeia/nasa4-400.jpg',
+					'float_fulltext'            => 'float-right',
+					'image_fulltext_alt'        => '',
+					'image_fulltext_alt_empty'  => 1,
+					'image_fulltext_caption'    => 'www.nasa.gov/multimedia/imagegallery'
+				),
 				'authorValue' => Text::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_9_FIELD_0'),
 			),
-
 			array(
 				// Article 10 - Typography
 				'catid'    => $catIds[2],
-				'images'   => array(
-					'image_intro'            => 'images/banners/banner.jpg',
-					'image_intro_caption'    => 'Cassiopeia',
-				)
 			),
 		);