Merge "Fix setting framework" into devel_3.0_main