merged v2.2.3 and LQEF