Merging issue2 changes into master

Does not fix the issue, I just want these particular changes in master.