Ben 190405 wrdate fixes
@lipinskimm & @baujc: This Merge Request correspond to various commits that have been forked from v5.0.1 THEY HAVE NOT BEEN CHECKED AGAINST proposed_master so please review/test them before merging.
@lipinskimm & @baujc: This Merge Request correspond to various commits that have been forked from v5.0.1 THEY HAVE NOT BEEN CHECKED AGAINST proposed_master so please review/test them before merging.