Changes for Issue 275

Spenser: Please review the changes and merge this. Do not push this to production tomorrow(21 nov) as it may need thorough testing from QA.