OGM-452 Incorporating review remarks
OGM-452 Use the persistent key to lock
OGM-452 Removing superfluous parameter
OGM-452 Avoiding some warnings
OGM-452 Describing new configuration option in the reference guide