FAIMS-375: fixing bug with breaking geometry while locked
merging master