see #3390. Also added isTRUE for some of the logical checks, please advise if this is okay
Attach a file by drag & drop or click to upload
