Updated bundle setup and project build related updates