@mappum, could you CR this and let me know if I've interpreted the
desired behavior correctly?