Signed-off-by: Adam Knapp adam.knapp@ericsson.com
requested review from @lnagy, @csilla, and @mmagyari
merged
