PR #4341 - tutur3u/platform