Add 'FancyLock' - Closes #4600