Merge commit '1d9e1c80fb6c0e32313a976ae0065fd32639f2bc' into mrg_dev_282