Removed transient flag, added partial and full lock flags and improved / fixed handling change of lock/visibility