Pullrequest: Devel - DO NOT MERGE

This pullrequest is only for code change discussions. Commits will be merged in single pullrequest.