Merging master with 'New exception added'