Image if is not checking the right things, or not working otherwise...
Merge origin/master