Bugzilla #35992 Updates based on insights gained through additional test cases. Submitted by: Manuel Mall <mm.at.arcus.com.au>