Merge "Merge changes from topic "multi-se-support" am: 54502d68ea am: 9c0ec9be9f am: 650ff88a4c"