FL-1327: stable builds pkg stabilization, WIP