ENTESB-933, ENTESB-934 Merged the patches into quickstarts