Thanks for the detailed review and comments, much appreciated. Will do rebase with "locked-" prefix to differentiate locked files instead of using "_" prefix for unlocked files. This should be much more clear and obvious. :+1: