merge qa story into newb branch