Updated script as described on SLIDPRE-12 ticket.
Merge branch 'SLIDPRE-12'