Reverting changes to master, will apply changes to feature branch