Reverted the last commit due to an unintentional merge of dev into release which should not have happened.