[CLI-12] Merge from develop