* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af': DO NOT MERGE. Experimental compatibility mode UI.