merge a5ul_3.4.0-ge21febe