Changes incorporated by !297 (merged) to develop, prepared to deployed branch.
merged
mentioned in commit d931d856