* Merge from layers branch

Signed-off-by: Jiri Hnidek <jiri.hnidek@tul.cz>