Merged changes between gbdk-293 and main