Merging master to beta

Fixed BULK file paths