[TAVSERV-340] Ensure that the added options are applied here too.