Merge branch 'devel/master' into tizen
authortscholb <scholb.kim@samsung.com>
Wed, 19 Jan 2022 01:59:04 +0000 (10:59 +0900)
committertscholb <scholb.kim@samsung.com>
Wed, 19 Jan 2022 01:59:04 +0000 (10:59 +0900)

Trivial merge