Merge "Add support for nop mode with l3 submode"