Merge "Cache and log enrollment settings" into qt-dev