LB-1829: Merge devel branch on master