SCRUM-1547 - Finished implementation but ignoring some test code
Merge remote-tracking branch 'origin/master'