Update to 201541. [1]
Convert to options helpers.
PR: 203823 [1] Submitted by: maintainer Sponsored by: Absolight