Added functionality for feature 32 and 33
approved this merge request
merged
mentioned in commit 93fdef15