incorporate https://github.com/ubccr/coldfront/pull/833
incorporate coldfront#833