Merge "Remove pieces of device entry flag part #3" into main