I've just reverted to 16.1 and this bug is not present in this version. I think I will stay on 16.1 until this is resolved. Unfortunately, I do not believe this will be resolved before my update service expires on July 7, 2019...