2.0.5 PR - See changelist for details