Apply same changes to master that were done with Dev