Merge pull request #135 from Pearson-Advance/vue/PADV-1580.re-opened

Merge pull request #135 from Pearson-Advance/vue/PADV-1580.re-opened #45