Adding demo with optional markers and autoclear=false
Adding test coverage around masks with optional markers and autoclear=false