FL-582: add oss4 to main tree