Merge improvement/platform into the Platform port

Emir's five base commits are the same patches this branch already holds
(git range-diff: 4e4865c..bdbd462 = f6de343..1ee94cc), replayed
on an older staging. Nothing new to take; the tree stays as is.

Author: waleedlatif1