FIFO-44: resolved, FIFO-45: resolved
Merge branch 'test' into dev